From 9dab00310d1d9552c94f34a666cb1a593ec98ae8 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 17 Oct 2014 20:09:17 +0200 Subject: [PATCH] Adwaita: use $backdrop_fg_color where it should .background:backdrop was not using that one so some labels didn't look right in backdrop. --- gtk/resources/theme/Adwaita/_common.scss | 11 +++++------ gtk/resources/theme/Adwaita/gtk-contained-dark.css | 11 +++++------ gtk/resources/theme/Adwaita/gtk-contained.css | 11 +++++------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index dda9176222..b2963a60a3 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -58,16 +58,15 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); ***************/ .background { - color: $fg_color; - background-color: $bg_color; -} + color: $fg_color; + background-color: $bg_color; -.background:backdrop { + &:backdrop { text-shadow: none; icon-shadow: none; - - color: lighten($fg_color,10%); + color: $backdrop_fg_color; background-color: $backdrop_bg_color; + } } /* diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 6d439d55d4..eec8664925 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -32,12 +32,11 @@ .background { color: #eeeeec; background-color: #393f3f; } - -.background:backdrop { - text-shadow: none; - icon-shadow: none; - color: white; - background-color: #393f3f; } + .background:backdrop { + text-shadow: none; + icon-shadow: none; + color: #939695; + background-color: #393f3f; } /* These wildcard seems unavoidable, need to investigate. diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 7394c74941..70d0a65354 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -32,12 +32,11 @@ .background { color: #2e3436; background-color: #ededed; } - -.background:backdrop { - text-shadow: none; - icon-shadow: none; - color: #454f52; - background-color: #ededed; } + .background:backdrop { + text-shadow: none; + icon-shadow: none; + color: #8d9091; + background-color: #ededed; } /* These wildcard seems unavoidable, need to investigate. -- 2.30.2